Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 31 Aug 2010 00:03:58 +0000 (00:03 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 31 Aug 2010 00:03:58 +0000 (00:03 +0000)

Trivial merge